manually verified update of pw
sorting out test, add general setup