Tidied up branching
Added numeric type fixture and changes made as per PR comments