Adds 4.1 and 4.2 checks and tests