adding shops, rm test shops, formatting