Fixed tests, changed BRP method