Added some unit test logic