Removed filter and contains functions and their tests