mock() implemented, tests updated