got more unit testing stuff working