events working
tweaked test