06e903c
Fixes and test improvements based on review feedback. Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>