improved lockfree policy
more tests