Fixed .count & .all query methods, added tests