added more unit tests
working on dealing with kwargs