changed name on test too
bugfixes