Reorganize tests to new structure
Add some tests