Sorted tests out