fixed br-issue; updated tests;