Adds SPIKE test and fixes smoke