Re ordering methods and tests accordingly to wiki