Updated with more tests and made tests modular

Can you change this to ejs so we are consistent across projects? It would resolve #6