Add some tests and move others
Make some incompatible changes for version 2.0