Restructure tests and finish IPv4