Add unit tests, add Runs