Add test and code to instantiate with 1 shelf by default