CastOrMapIfPossibleOptionsTests added
Code cleanup