Renamed unit tests. Renamed Option to Choice, makes more sense.
Added (expected=NullPointerException.class) to test so that i don't swallow exceptions.