more unit testing, starting to look good :)