Merge "Add base test class for unit tests"