Improved tests. ContentProperty used is from the PCL