Fixed broken tests. Fixes #15