Tweaks to s3_controller
Updated test and code for s4_component
Using badge-name everywhere for id
Updated code and tests for s5_model
Removed unnecessary injects in s5 tests