Major update to tests to separate out the plain and HAL tests