Initial unit tests -to merge