created test directory, tweaked tests