Tests updated to work without Main.