More tests, restructed Module and Provider files