Improved tests
Merge branch '0.3'