Add space test
MISC update