Fix some issue after got ready for testing