Tests updated and new tests added