adopted existing unit tests to current version