Clear up tests
Merge branch 'dev' into levels/free