fix failing test, minor changes