Address initial feedback, generalize tests