#178 cleaned up old test code