Add some tests and module connection