Added some tests and did a build