Friday June 28, 2013 -- Added first tests