Updated Test and simplified tests