Fixed function call to be an expression, removed unit tests