Removed troublesome lines related to test suite layers