More props fixes...

Unit tests for props too...