Actually cleaned up old tests this time