TEST: splitting test into multiple files and adding some tests