refactoring + new bid tests