Made tests go green. Fixes #17