Added support for scalar values
Fixed issues when running page cycler tests