split unittest + fix