Changed/added variables..
Split main test into sub-tests.
Changed keywords structure.