Change tests and add comment spaces