new tests
Removed STOP implementation