Remove unnecessarily added-back tests
Add mappings and revise incorrect tests to resolve smokey failures
Merge pull request #842 from rjc123/smokey_improvement

Remove unnecessarily added-back tests