Tests cleanup
Merge pull request #37 from vicb/test/cleanup

Tests cleanup