Various small changes and added new tests

Some small changes at various places
Added more tests
Added option to skip all tests that run against the live server