Whoops, just removing some debug code
also, test values changed for debug purposes