Removed test macros that were just duplicates to get around the XCTest/SenTest problem.