Cleanup, fix test