Update with more modules and tests