Small bug fix, and some more TODO notes for future tests to add