Ensure properties persist and also adding more test cases around that
Merge branch 'master' of github.com:openskye/openskye