Removing deprecated import for tests
Minor bug fixes
Merge branch 'master' of https://github.com/piecework/piecework