Implemented new tests