final tests, added a fix