(*) Improved Test and added performance test