Some clean up and update documentation
Add more test properties