fixed test suite and moved module include tests back to main project