Added some test and setup