Updated with more tests and made tests modular

missing callback.fail() ?