Fixed some bugs, updated print methods, converted templates, now... tests =)