Move several unit tests into test module