Start adding a more tests
Remove old tests