Fixed tests, and added basic comment support