Move initialization to main class
Add DisplayState class
Use proper scope for junit