Removed a feature that isn't done, yet. Removed a couple @test tags from scenarios that are now working.