Add more tests
Delete all the old code
Merge tests from experimental repo