Updated the test a bit + updated the components a little bit with some more information exposure.