working. API-based tests now caught up w working functionality. :)
working, little tidying. tests still match functionality. yayy