Fixing the tests. Need to add weighted tests later.