Restructure tests and add converted from python tests #40