Adding some test code and spec