Made code more consistent
Added test for imagery version