Minor updates:
- tests added
- ldToggle removed, not used anymore