Fixed tests to reflect expected behaviour