- Use of TestMethods methods + some bugfixes.