Renamed some fields, changed last test run storage to hashmap