Feature/atomize tests