Added intial unit tests