PS8 and other implementation fixes, tests updated