Switched to a more minimal test system
Add some more tests, comment out unreachable code