Little update to fix issues from Beta 6
Fixed up an issue in the tests with an optional