Got some more tests working.