this is the worst thing ever
fixed another bug, improved test fixture