Renamed methods, more tests. Fixed count results