Removed unnecessary boolean column, updated tests