removed C stuff... added tests