Move class composition to writing object.
Run tests in more specific folders.