Polished the tests and deck