Fix nose errors, more Pg testing adapating