Add tests to final