Added max version tests and impl