Added missing tests. Pragma cleanup.