Fixing status and test behavior