Removed Some Test Abstractions