Updated to include a test