expanded tests into multiple files