optimize some tests
Merge pull request #79 from maraoz/optimize/tests

optimize some tests