Whoops, forgot the bracket t! Also, initial work on test suite.