added unit testing to check shuffling, moved srand call.