More tests.
Fixed initial test onEntry not running.
Added more tests.