Updates to unit tests. Checks for classmethod/staticmethod when nested decorators used.