Moved shuffle test to own file, improved unit tests