bugfixes
bugfix - test works