Updated with more tests and made tests modular

callback.fail() ?