Tests and errors upgrade