Fixes #3 more tests