properties & construc fixes & Unit test