First commit of spike-test code