Uncomment tests. Duh
Merge branch 'dev'