re-added tests
add some spikes