updated Tray, Solver, and InputSource
updated TrayTest