Updating tests to meet latest functionality. Hopefully Travis is green now :)