Updated tests. Coverage at 100% (not like that really means anything :( .)