Implementing/Adjusting tests