Fix failing tests and rename test module