Updating tests, fixing bugs