More tests
Remove old tests