Added more tests, all of which will fail right now.