Tests and temporary fix for #53
Commented out the wrong thing.