Fix latest merge
Fix unit test names, property and function visibility
Fix unit test names
Love for unit tests