Updated tests to work better with updated library