Tests added and regex removed