Add some unit testing