Added a test
Better test organization
Test code reformatting
Added more change tests
Add extra props for loadables