fix bins, fix test