Restructure unit tests, one class per method