tests and features and cleanup, oh my