fixing whoami function & related spec