light-object tests
merge conflicts solved