adjusted tests to comply with bugfixes made for issue #5