Rolled back from Laravel and Shuffle testing

Signed-off-by: Roy Verrips <roy@verrips.org>