Tweaked ons.py a little with some test data and method changes