added tests and POD