Add argument parsing & changes to test setup