More tests moved to individual files

Added test_name variable to simplify things