move expire tests into test_* and update manifest