Changes to tests, added comments