Remove old tests
Testing different approaches