Added long and unsigned long mocked parameter types

I also cleaned up a few formatting inconsistencies