Added test for accessory, fixed more accessory stuff