Additional testing bloat removed