Fixes #12: Tests fixed