fixes a reference bug; #1
updates test cases and fixtures; fixes #1