Test cleanup

Update tests per #3