Merge pull request #11 from shopsmart/cleanup_test_imports

Test import path cleanup
Bringing master up-to-date with crowdmob.