re-organise some proposed tests
Tests and implementation