moved initialisation to 'main' layout
tweaked timing, added empty tests filke