ILSS tests + added TODO notes