Changed tests. Ignored temporarily