#6
#5 refactored BatteryType class
#4 annotations in entity class
#7 optimized test