More tests
Rebuild console system for better performance