Added some tests - version 1 is ready!