Updating tests to accomodate for recent changes. @High5Travis!