Tests added and updated