bitset
updated tests
merge