added more unit testing stuff