Further expansion of unit tests for recently added features/improvements