added test stub for bulk loading of bottle types
updated with the story so far
Merge branch 'master' into test_fix
fixed final tests