cleaning up features and moving tests forward