did some tweaks to fix tests. everything looks to be working.