Fix functional tests

- added check for null blocks
- removed payment tests from functional tests since special credentials are needed
Indentation here as well and below (and anywhere else). Thanks!