Adds additional test object and support for spotlight scaling