1x @AndroidAdapter bugfix an 1x @EnumProperty bugfix

Hiya,

I appreciate your unit tests a lot. :)

The first commit fixes an EnumProperty bug, you mentioned in #41.
The 2nd commit fixes a bad design decision I made a while ago, that we discussed in #43.