Merge pull request #156 from jix/refactor-tests