Organising tests
Remove old test