lock it down
fix tests