Updated tests,
Updated properties visibility