Disable problem code. Add more tests