tests cleaned up