added tests - more to come