Re-implemented test that got lost in an earlier refactor
Deleted redundant files