Refactor tests

replace deprecated aliases
Fix typos