Adpated tests to databse changes