Fixed tests from previous bugfix