Removed unused code and fixed issue with test group and package for psql