end to end test + fix spiro bug
end to end tests + fix another bug - now working