Cleaning up unit/features tests