Added some more unit tests. Found pesky memory leak error. FIXED! Woot.