Renamed test method
Bundle version
Removed some optionality