fleshed in some tests, working on kwargs conversion