Remove unused files, finalize test structure