Changed Requirement model to include acceptance tests
Tests are now semi-functional
Fixed Merge Conflicts