Updated spec file for better tests