Adding tests and module type