More pricing unit tests improvements