Sorted out existing tests