Moved few more tests