Added test suite and runner - fixed some naming