Remove test folder
Modify feature tests
Write Unit and Acceptance Tests