Get more tests working