Fixed module exports to better adhere to OOP. Also adapted tests