Tests added to 2.1