More unit tests for recently added changes