Now have working tests (though they don't cover much)