Added message handling fr computer
Optimized test