fleshed out tests
finished up unit tests