Added more features to the mock server.
Added support for new commands.

Refactored some old ones too.
Minor refactoring and reformatting.

Removed all ups="" from methods.
Added even more methods.