Adding tests, fixing listings, added accept functionality