Fixed all errors and failuers. Also updated Status test