atos / stoa fixes and test + 100% coverage