Add minimal tests
expand minimal test functionality