Added second implementation of objects and some unit testing code