Got more tests working.