Fixed errors found.
Renamed test cases for easier searching.
Working on filter.