test improvements, added test modules to setup