Fixed tab/space and blank line issues with source code.
Fixed intermittent failing randomized specs where order was important.