Add a bunch more tests. Build should pass now!