bugfix + test suite expansion