Working on fulfilling the tests of the base