expanded encoder tests
drop (uh, hopefully) unnecessary safety check
test coverage