Adding test cases, metadata and correcting bugs