Feature specs fixed, a couple of test cases are still pending