unit tests cleaned up