don't test deprecated stuff
add override markup
reorder methods in optimizer state

 close #423, although I don't understand what is happening.