unit tests cleaned up slightly