Updated tests, minor changes