Small bugfix and updated the test