added some tests, more to come