move tests into test stream
add test modules