Two more tests pass ^_^