Updated with more tests and made tests modular

Change to: contains at least the following information?