Fix #32: Port over more tests