Testing Fixes, per asuth's review