Corrected function tests to work with PS