Test plan. More tests and some lightbulbs fixed