Added many tests