Added new tests and updated them along with the test structure in the project.