fix and some test