#580, #581 Created options mapping tests and option service tests