Added a few tests that need to be implemented later
Merged