Fix bug with query not being added.
Added more methods to Property types
Added test for Template parsing.