Added some tests and report