added a few tests and prepared for testing