LCD bug fixes
Test changes