Add in tests for completeness; adjust logic accordingly.