Add World vs World
Split the model objects into each of their own respective files to better organization.
Re-order some of the tests; moving slower tests to the bottom.