added a few more modules and some test