Light bug fixes and cleaner tests.