More tests and important criteria bux fixed