[TASK] Further extend test coverage and improve structure