Updated definition file and tweaked tests to pass