Added helper functions, new tests and did away with find