Complete test suite
Add indication in tests