QA: Additional unit tests and docblock fixes