fixes for after checkin
PHP hack on unit testing