Fixed some issues with the test itself