added more tests for make_next_assignment
refactored make_next_assignment method in light of failed tests