Cleanup, added test